]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2cd5975) | patch
vpatch: allow a file in list to be a 'merger' instead of a patched file.
authorNeilBrown <neilb@suse.de>
Tue, 13 Nov 2012 05:59:10 +0000 (16:59 +1100)
committerNeilBrown <neilb@suse.de>
Tue, 13 Nov 2012 05:59:10 +0000 (16:59 +1100)
commitb320d944f42c020734c844c3189b99a244019b0b
tree5afc43595c2d5a6ac433ef6dae13f3c84dc53a1atree | snapshot
parent2cd5975410cb704411bcad9588f0d8606ec12c2fcommit | diff
vpatch: allow a file in list to be a 'merger' instead of a patched file.

This will be useful once we can save files - the result of a save is
a merger.

Signed-off-by: NeilBrown <neilb@suse.de>
vpatch.c diff | blob | history
apply rejected patches and perform word-wise diffs